projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 08e154c) | patch
(smerge-match-conflict): Try to do something sensible
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:19:11 +0000 (20:19 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:19:11 +0000 (20:19 +0000)
commitb8f9cbf275dbc548abe3615ea81f59578dc1e39e
tree9b604fc94fccb396a2b929f500807e4546aafc2ctree | snapshot
parent08e154ce3700d01b9ed02c238464cc340dfdcb14commit | diff
(smerge-match-conflict): Try to do something sensible
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.